Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix data race of DeltaIndex::toString (#5948) #5954

Merged
merged 3 commits into from
Oct 10, 2022
Merged

Fix data race of DeltaIndex::toString (#5948) #5954

merged 3 commits into from
Oct 10, 2022

Conversation

ti-chi-bot
Copy link
Member

This is an automated cherry-pick of #5948

What problem does this PR solve?

Issue Number: close #5947

Problem Summary:

DeltaIndex::toString is not thread-safe. Member variable delta_tree (std::shared_ptr<DefaultDeltaTree>) can be modifed concurrently.

What is changed and how it works?

Acquire lock in the begin of DeltaIndex::toString.

Check List

Tests

  • Unit test
  • Integration test
  • Manual test (add detailed scripts or steps below)
  • No code

Side effects

  • Performance regression: Consumes more CPU
  • Performance regression: Consumes more Memory
  • Breaking backward compatibility

Documentation

  • Affects user behaviors
  • Contains syntax changes
  • Contains variable changes
  • Contains experimental features
  • Changes MySQL compatibility

Release note

None

@ti-chi-bot
Copy link
Member Author

ti-chi-bot commented Sep 19, 2022 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • JinheLin
  • hehechen

To complete the pull request process, please ask the reviewers in the list to review by filling /cc @reviewer in the comment.
After your PR has acquired the required number of LGTMs, you can assign this pull request to the committer in the list by filling /assign @committer in the comment to help you merge this pull request.

The full list of commands accepted by this bot can be found here.

Reviewer can indicate their review by submitting an approval review.
Reviewer can cancel approval by submitting a request changes review.

@ti-chi-bot ti-chi-bot added do-not-merge/cherry-pick-not-approved release-note-none Denotes a PR that doesn't merit a release note. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. type/cherry-pick-for-release-6.1 This PR is cherry-picked to release-6.1 from a source PR. labels Sep 19, 2022
@ti-chi-bot ti-chi-bot mentioned this pull request Sep 19, 2022
Merged
12 tasks
@ti-chi-bot ti-chi-bot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Sep 19, 2022
@VelocityLight VelocityLight added cherry-pick-approved Cherry pick PR approved by release team. and removed do-not-merge/cherry-pick-not-approved labels Sep 26, 2022
@flowbehappy flowbehappy self-requested a review October 9, 2022 09:18
@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Oct 9, 2022
@JinheLin
Copy link
Contributor

JinheLin commented Oct 9, 2022

/run-all-tests

@JinheLin
Copy link
Contributor

JinheLin commented Oct 9, 2022

/build

@JinheLin JinheLin assigned JaySon-Huang and unassigned JaySon-Huang Oct 9, 2022
@ti-chi-bot ti-chi-bot added status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels Oct 9, 2022
@JinheLin
Copy link
Contributor

JinheLin commented Oct 9, 2022

/merge

@ti-chi-bot
Copy link
Member Author

@JinheLin: It seems you want to merge this PR, I will help you trigger all the tests:

/run-all-tests

You only need to trigger /merge once, and if the CI test fails, you just re-trigger the test that failed and the bot will merge the PR for you after the CI passes.

If you have any questions about the PR merge process, please refer to pr process.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the ti-community-infra/tichi repository.

@ti-chi-bot
Copy link
Member Author

This pull request has been accepted and is ready to merge.

Commit hash: c7f305e

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Oct 9, 2022
@ti-chi-bot
Copy link
Member Author

@ti-chi-bot: Your PR was out of date, I have automatically updated it for you.

At the same time I will also trigger all tests for you:

/run-all-tests

If the CI test fails, you just re-trigger the test that failed and the bot will merge the PR for you after the CI passes.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the ti-community-infra/tichi repository.

@sre-bot
Copy link
Collaborator

sre-bot commented Oct 9, 2022

Coverage for changed files

Filename                                                                                                 Regions    Missed Regions     Cover   Functions  Missed Functions  Executed       Lines      Missed Lines     Cover    Branches   Missed Branches     Cover
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
/home/jenkins/agent/workspace/tiflash-build-common/tiflash/dbms/src/Storages/DeltaMerge/DeltaIndex.h          44                 5    88.64%          15                 0   100.00%         104                11    89.42%          24                 5    79.17%
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
TOTAL                                                                                                         44                 5    88.64%          15                 0   100.00%         104                11    89.42%          24                 5    79.17%

Coverage summary

Functions  MissedFunctions  Executed  Lines   MissedLines  Cover
18355      9782             46.71%    206278  97916        52.53%

full coverage report (for internal network access only)

@JinheLin
Copy link
Contributor

JinheLin commented Oct 9, 2022

/merge

@ti-chi-bot
Copy link
Member Author

@JinheLin: It seems you want to merge this PR, I will help you trigger all the tests:

/run-all-tests

You only need to trigger /merge once, and if the CI test fails, you just re-trigger the test that failed and the bot will merge the PR for you after the CI passes.

If you have any questions about the PR merge process, please refer to pr process.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the ti-community-infra/tichi repository.

@sre-bot
Copy link
Collaborator

sre-bot commented Oct 9, 2022

Coverage for changed files

Filename                                                                                                 Regions    Missed Regions     Cover   Functions  Missed Functions  Executed       Lines      Missed Lines     Cover    Branches   Missed Branches     Cover
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
/home/jenkins/agent/workspace/tiflash-build-common/tiflash/dbms/src/Storages/DeltaMerge/DeltaIndex.h          44                 5    88.64%          15                 0   100.00%         104                11    89.42%          24                 5    79.17%
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
TOTAL                                                                                                         44                 5    88.64%          15                 0   100.00%         104                11    89.42%          24                 5    79.17%

Coverage summary

Functions  MissedFunctions  Executed  Lines   MissedLines  Cover
18355      9782             46.71%    206278  97907        52.54%

full coverage report (for internal network access only)

@JinheLin
Copy link
Contributor

JinheLin commented Oct 9, 2022

/merge

@ti-chi-bot
Copy link
Member Author

@JinheLin: It seems you want to merge this PR, I will help you trigger all the tests:

/run-all-tests

You only need to trigger /merge once, and if the CI test fails, you just re-trigger the test that failed and the bot will merge the PR for you after the CI passes.

If you have any questions about the PR merge process, please refer to pr process.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the ti-community-infra/tichi repository.

@sre-bot
Copy link
Collaborator

sre-bot commented Oct 9, 2022

Coverage for changed files

Filename                                                                                                 Regions    Missed Regions     Cover   Functions  Missed Functions  Executed       Lines      Missed Lines     Cover    Branches   Missed Branches     Cover
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
/home/jenkins/agent/workspace/tiflash-build-common/tiflash/dbms/src/Storages/DeltaMerge/DeltaIndex.h          44                 5    88.64%          15                 0   100.00%         104                11    89.42%          24                 5    79.17%
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
TOTAL                                                                                                         44                 5    88.64%          15                 0   100.00%         104                11    89.42%          24                 5    79.17%

Coverage summary

Functions  MissedFunctions  Executed  Lines   MissedLines  Cover
18370      9786             46.73%    206589  97953        52.59%

full coverage report (for internal network access only)

@JinheLin
Copy link
Contributor

JinheLin commented Oct 9, 2022

/merge

@ti-chi-bot
Copy link
Member Author

@JinheLin: It seems you want to merge this PR, I will help you trigger all the tests:

/run-all-tests

You only need to trigger /merge once, and if the CI test fails, you just re-trigger the test that failed and the bot will merge the PR for you after the CI passes.

If you have any questions about the PR merge process, please refer to pr process.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the ti-community-infra/tichi repository.

@sre-bot
Copy link
Collaborator

sre-bot commented Oct 9, 2022

Coverage for changed files

Filename                                                                                                 Regions    Missed Regions     Cover   Functions  Missed Functions  Executed       Lines      Missed Lines     Cover    Branches   Missed Branches     Cover
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
/home/jenkins/agent/workspace/tiflash-build-common/tiflash/dbms/src/Storages/DeltaMerge/DeltaIndex.h          44                 5    88.64%          15                 0   100.00%         104                11    89.42%          24                 5    79.17%
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
TOTAL                                                                                                         44                 5    88.64%          15                 0   100.00%         104                11    89.42%          24                 5    79.17%

Coverage summary

Functions  MissedFunctions  Executed  Lines   MissedLines  Cover
18370      9786             46.73%    206589  97973        52.58%

full coverage report (for internal network access only)

@JaySon-Huang
Copy link
Contributor

/rebuild

@JaySon-Huang
Copy link
Contributor

/run-integration-test

1 similar comment
@JinheLin
Copy link
Contributor

/run-integration-test

@ti-chi-bot ti-chi-bot merged commit ca39013 into pingcap:release-6.1 Oct 10, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@hehechen hehechen hehechen approved these changes

@JinheLin JinheLin JinheLin approved these changes

@flowbehappy flowbehappy Awaiting requested review from flowbehappy

@Lloyd-Pottiger Lloyd-Pottiger Awaiting requested review from Lloyd-Pottiger

@JaySon-Huang JaySon-Huang Awaiting requested review from JaySon-Huang

@lidezhu lidezhu Awaiting requested review from lidezhu

Assignees

@JinheLin JinheLin

Labels
cherry-pick-approved Cherry pick PR approved by release team. release-note-none Denotes a PR that doesn't merit a release note. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. status/can-merge Indicates a PR has been approved by a committer. status/LGT2 Indicates that a PR has LGTM 2. type/cherry-pick-for-release-6.1 This PR is cherry-picked to release-6.1 from a source PR.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@ti-chi-bot @JinheLin @sre-bot @JaySon-Huang @hehechen @VelocityLight